@@ -100,7 +100,7 @@ def clerk_list(request): |
||
| 100 | 100 |
admin_id = request.session.get('admin_id')
|
| 101 | 101 |
|
| 102 | 102 |
try: |
| 103 |
- administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True) |
|
| 103 |
+ administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True).order_by('-pk')
|
|
| 104 | 104 |
except AdministratorInfo.DoesNotExist: |
| 105 | 105 |
return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND) |
| 106 | 106 |
|
@@ -94,7 +94,7 @@ def distributor_list(request): |
||
| 94 | 94 |
admin_id = request.session.get('admin_id')
|
| 95 | 95 |
|
| 96 | 96 |
try: |
| 97 |
- administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True) |
|
| 97 |
+ administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True).order_by('-pk')
|
|
| 98 | 98 |
except AdministratorInfo.DoesNotExist: |
| 99 | 99 |
return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND) |
| 100 | 100 |
|
@@ -107,7 +107,7 @@ def model_list(request): |
||
| 107 | 107 |
admin_id = request.session.get('admin_id')
|
| 108 | 108 |
|
| 109 | 109 |
try: |
| 110 |
- administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True) |
|
| 110 |
+ administrator = AdministratorInfo.objects.get(admin_id=admin_id, user_status=AdministratorInfo.ACTIVATED, status=True).order_by('-pk')
|
|
| 111 | 111 |
except AdministratorInfo.DoesNotExist: |
| 112 | 112 |
return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND) |
| 113 | 113 |
|
@@ -117,7 +117,7 @@ def operator_list(request): |
||
| 117 | 117 |
except AdministratorInfo.DoesNotExist: |
| 118 | 118 |
return response(AdministratorStatusCode.ADMINISTRATOR_NOT_FOUND) |
| 119 | 119 |
|
| 120 |
- optors = OperatorInfo.objects.filter(brand_id=administrator.brand_id, user_status=OperatorInfo.ACTIVATED, status=True) |
|
| 120 |
+ optors = OperatorInfo.objects.filter(brand_id=administrator.brand_id, user_status=OperatorInfo.ACTIVATED, status=True).order_by('-pk')
|
|
| 121 | 121 |
optors, left = pagination(optors, page, num) |
| 122 | 122 |
optors = [optor.data for optor in optors] |
| 123 | 123 |
|
@@ -18,7 +18,7 @@ django-logit==1.1.2 |
||
| 18 | 18 |
django-mobi==0.1.7 |
| 19 | 19 |
django-models-ext==1.1.6 |
| 20 | 20 |
django-multidomain==1.1.4 |
| 21 |
-django-paginator2==1.0.3 |
|
| 21 |
+django-paginator2==1.0.4 |
|
| 22 | 22 |
django-redis-connector==1.0.1 |
| 23 | 23 |
django-response==1.1.1 |
| 24 | 24 |
django-rlog==1.0.7 |